From 4e9ae8c3666f9d4e2b56f24ff5873565a0aa9d60 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Wed, 25 May 2005 17:43:39 +0000 Subject: [PATCH] bitkeeper revision 1.1557 (4294b94bIF7VSJm4DWqLidHZJXHecQ) x86/64 build fixes. Signed-off-by: Keir Fraser --- xen/arch/x86/x86_64/traps.c | 1 + xen/arch/x86/x86_64/usercopy.c | 2 ++ xen/include/asm-x86/mach-es7000/mach_mpparse.h | 2 +- xen/include/xen/dmi.h | 9 --------- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index 4bd093a1da..3a33e72a4d 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -8,6 +8,7 @@ #include #include #include +#include #include void show_registers(struct cpu_user_regs *regs) diff --git a/xen/arch/x86/x86_64/usercopy.c b/xen/arch/x86/x86_64/usercopy.c index 547cacc91b..e96eb94d4d 100644 --- a/xen/arch/x86/x86_64/usercopy.c +++ b/xen/arch/x86/x86_64/usercopy.c @@ -5,6 +5,8 @@ * Copyright 1997 Linus Torvalds * Copyright 2002 Andi Kleen */ + +#include #include /* diff --git a/xen/include/asm-x86/mach-es7000/mach_mpparse.h b/xen/include/asm-x86/mach-es7000/mach_mpparse.h index 85809e0898..a7c2658e3c 100644 --- a/xen/include/asm-x86/mach-es7000/mach_mpparse.h +++ b/xen/include/asm-x86/mach-es7000/mach_mpparse.h @@ -20,7 +20,7 @@ static inline int mps_oem_check(struct mp_config_table *mpc, char *oem, { if (mpc->mpc_oemptr) { struct mp_config_oemtable *oem_table = - (struct mp_config_oemtable *)mpc->mpc_oemptr; + (struct mp_config_oemtable *)(long)mpc->mpc_oemptr; if (!strncmp(oem, "UNISYS", 6)) return parse_unisys_oem((char *)oem_table, oem_table->oem_length); } diff --git a/xen/include/xen/dmi.h b/xen/include/xen/dmi.h index d2bcf55608..ba42456c50 100644 --- a/xen/include/xen/dmi.h +++ b/xen/include/xen/dmi.h @@ -32,16 +32,7 @@ struct dmi_system_id { #define DMI_MATCH(a,b) { a, b } -#if defined(CONFIG_X86) && !defined(CONFIG_X86_64) - extern int dmi_check_system(struct dmi_system_id *list); extern char * dmi_get_system_info(int field); -#else - -static inline int dmi_check_system(struct dmi_system_id *list) { return 0; } -static inline char * dmi_get_system_info(int field) { return NULL; } - -#endif - #endif /* __DMI_H__ */ -- 2.30.2